Trackfilter: don't rename track if we don't have a source track name. Style

improvements on generating that new segment.

diff --git a/gpsbabel/trackfilter.c b/gpsbabel/trackfilter.c
index e2d64b645c9206408053fd25c50d9061f73ab0b8..9faa32813738b97b3dc0771d1b6d97303634a06c 100644 (file)
--- a/gpsbabel/trackfilter.c
+++ b/gpsbabel/trackfilter.c
@@ -943,9 +943,9 @@ trackfilter_seg2trk(void)
         dest = route_head_alloc();
         dest->rte_num = src->rte_num;
         /* name in the form TRACKNAME #n */
-        snprintf(trk_seg_num_buf, sizeof(trk_seg_num_buf), "%d", ++trk_seg_num);
-        dest->rte_name = (char*) xmalloc(strlen(src->rte_name)+strlen(trk_seg_num_buf)+3);
-        sprintf(dest->rte_name, "%s #%s", src->rte_name, trk_seg_num_buf);
+        if (src->rte_name) {
+          xasprintf(&dest->rte_name, "%s #%s", src->rte_name, ++trk_seg_num);
+        }
 
         /* Insert after original track or after last newly
          * created track */